[PATCH 2/8] x86/speculation: Add eIBRS + Retpoline options
authorPeter Zijlstra <peterz@infradead.org>
Wed, 16 Feb 2022 19:57:01 +0000 (20:57 +0100)
committerSalvatore Bonaccorso <carnil@debian.org>
Tue, 8 Mar 2022 17:47:04 +0000 (17:47 +0000)
commit7ebb17c7ac9fdcddef96dd86f1bd009f0ad99eaa
tree3da8febc71efcc362631be564e4248b2a3cd0ae8
parentbaa7d94cf679e3d9da2256e0ad2727b16de4ea6e
[PATCH 2/8] x86/speculation: Add eIBRS + Retpoline options

commit 1e19da8522c81bf46b335f84137165741e0d82b7 upstream.

Thanks to the chaps at VUsec it is now clear that eIBRS is not
sufficient, therefore allow enabling of retpolines along with eIBRS.

Add spectre_v2=eibrs, spectre_v2=eibrs,lfence and
spectre_v2=eibrs,retpoline options to explicitly pick your preferred
means of mitigation.

Since there's new mitigations there's also user visible changes in
/sys/devices/system/cpu/vulnerabilities/spectre_v2 to reflect these
new mitigations.

  [ bp: Massage commit message, trim error messages,
    do more precise eIBRS mode checking. ]

Co-developed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Patrick Colp <patrick.colp@oracle.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gbp-Pq: Topic bugfix/x86/bhb
Gbp-Pq: Name 0002-x86-speculation-Add-eIBRS-Retpoline-options.patch
arch/x86/include/asm/nospec-branch.h
arch/x86/kernel/cpu/bugs.c